This reverts commit 49b54d64ca. Bug: 63400667 Change-Id: Ica0696bf4ae3f9a84f0e4ad6e1207374696e9497
49b54d64ca