Bug: 17526079 Change-Id: I664e5e2d5103b87ed02f082551e46513f64b95a1 (cherry picked from commit 1f9b32f0)