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