This reverts commit 0857d7caa0. Reason for revert: breaks build: b/162086397 Change-Id: If91c59aa5485cd78e42b743a7bf786c68283aecb
0857d7caa0