This reverts commit 891a011394. Reason for revert: Some Test failed, need more investigation Bug: 136199978 Change-Id: Ibad0dad02a6701447c39ddcc805d44c9e68bdcce
891a011394