Bug: 19900185 Change-Id: I70128e5ff2b40dadc677ba744e3450a6499b5328 (cherry picked from commit 5dbab866)