Bug: 124232146 Test: m droid Merged-In: I25ad003c70b5028942d50d8e83d1cc62ee74d31b Change-Id: I25ad003c70b5028942d50d8e83d1cc62ee74d31b (cherry picked from commit 57e23f19)