Bug: 19333589 (cherry picked from commit d5e5a0e6) Change-Id: If394a678ef6271c1119dac3f959773f23e789c56