This reverts commit 74af0fe9e6. Reason to revert: issue has been fixed Bug: 239364576 Bug: 239364745 Signed-off-by: Robin Peng <robinpeng@google.com> Change-Id: Iaef3454b376a7d5266b72f242b0ca94c77e1c1fe
74af0fe9e6