This reverts commit fb735de0e8. Reason for revert: This CL made whole test failed. Bug: 153624005 Bug: 150952393 Bug: 151122313 Change-Id: I083529616dbf80421ea6a322bb57d2bb0f2bca62
fb735de0e8