Bug: 12118307 (cherry picked from commit b084fef1) Change-Id: I49eff73f89633052a2587112cdc381ae6d254bfe