Bug: Issue 5920 Change-Id: I93ac36c87b43edb4dd67c13089c7c9a08a3679bb (cherry picked from commit baf902fae01677dc3042c8f60ba08be79af6c77c)