5cca2265b6
This reverts commit 42a7d1af83.
REASON FOR REVERT: the underlying framework bug is fixed
Test: presubmit
Bug: 187080582
Change-Id: If580a35196ba9a9c5e3a5da642a2ea3aa3d9048e