This is basically reverting to earlier behavior.
Test: basic sanity
Bug: 134375393
Merged-in: I44dc66f9f3d5d4dfcab95220d7a6a6be0ed5a825
Change-Id: I44dc66f9f3d5d4dfcab95220d7a6a6be0ed5a825
(cherry picked from commit 900aad9924)
This is basically reverting to earlier behavior.
Test: basic sanity
Bug: 134375393
Merged-in: I44dc66f9f3d5d4dfcab95220d7a6a6be0ed5a825
Change-Id: I44dc66f9f3d5d4dfcab95220d7a6a6be0ed5a825
(cherry picked from commit 900aad9924)