Bug: 71627785 bug: 72428887 This reverts commit 4eb45631. Change-Id: I601d78dbf1f9dafe8317e2db72831869a4092911