This reverts commit eddb7c09. Reason for revert: b/36518752 Bug: 36518752 Change-Id: I39773db7b8d02aec360ca80d02b3c161ccf02786