Bug: 11483665 Change-Id: Iebf0fe21926bb3a1ef1f94e3fbea72325cbd85ee (cherry picked from commit 562ec524)