This reverts commit 8efe8ed4. Reason for revert: For fixing b/172006640 Change-Id: I7e6e1bbbf2d847fb15cfa9c1d35310509777d735