Reason for revert: b/144387414 Fixes: b/144387414 Change-Id: I21e15a4d149a5a8fefd0f84010600cb41b59db95