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