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