Bug: 145553588
Test: adb shell commands; manual
Change-Id: I687635ff78439dd446df538312c4811ef8073ea3
Merged-In: I687635ff78439dd446df538312c4811ef8073ea3
(cherry picked from commit 0de373a192)
Bug: 145553588
Test: adb shell commands; manual
Change-Id: I687635ff78439dd446df538312c4811ef8073ea3
Merged-In: I687635ff78439dd446df538312c4811ef8073ea3
(cherry picked from commit 0de373a192)