BUG: 18483774 Change-Id: I77567f9000099b07e2c84f45b73289272b9b5276 (cherry picked from commit 496fa67b)