This reverts commit e05faa48. Reason for revert: b/211932785 Change-Id: Ib65e84289c07e6dd236914fbcad48b0c77df77f0