This reverts commit 956f4dc231. Reason for revert: b/171022033 Change-Id: I6f28a18ef2487fda7a205bc8bfe9d0835b553b07
956f4dc231