Bug: 14298175 (cherry picked from commit bf8a374a92) Change-Id: I183d1ff078a54c422305d8798ea200855265ebb6
bf8a374a92