Bug: 10351880 (cherry picked from commit 5d5ff5a81d) Change-Id: Ied4db819e0a62352776f7b19365e30a079a51b9f
5d5ff5a81d