Bug: 70958370 Bug: 69121056 This reverts commit 04f63320. Change-Id: Id8aec9fc5a269bf915bb80c3e5f929b83a7e3ea9