Bug: Issue 11973 Change-Id: Id86182e40050eabbcf74c190df19a0a84a60c002 (cherry picked from commit 912d3b5ccc)
912d3b5ccc