This reverts commit d6be9e51. Reason for revert: b/267608166. Change-Id: Ie07caa5ace3bcb290829e6fa476c5e1d47b975ba Fixed: 267608166