ed53d1c21c
This reverts commit f9ccf0175d.
Reason for revert: to see whether b/151613234 is fixed
Test: pre-, post- submit
Bug: 151613234
Change-Id: Ieda2907319d796a57494318920c22f3db4527dab