Bug: b/14988808 (cherry picked from commit 700c6fd81d) Change-Id: I222a1858f6e46fa947e5b6ad9c48a7126d66ec70
700c6fd81d