Bug: 16884833 (cherry picked from commit 961ae12dea) Change-Id: I67f037ea81d2a4ede4294afd8b84b7640e534a13
961ae12dea