This reverts commit 5dad7cd4. Reason for revert: b/159995598 Bug: 159995598, 115619667 Change-Id: I6df037161dc36da7f8b33292529bbc37058f819c