21720c9a2c
This reverts commit 827335f209.
Reason for revert: Problem solved
Bug: 195319692
Test: presubmit
Change-Id: I084c8a6b6acdaa3ee4697fc752e817d292ba0665