Bug: 74851117 Fixes: 77937472 This reverts commit 8bb9bbf1. Change-Id: I2dea3fec7ca3f59c63ce9395ba2784ca9dc58316