This reverts commit 88f3d4db. Bug: 72554856 Test: repro instructions in bug (cherry picked from commit 76f0ccb5) Change-Id: I947e43dc69531aac0a1356ad7562164229f32444