Bug: 223736548 Test: make This reverts commit d91acaba1a. Change-Id: I18aa2cb60403b131dcf353f8b51e831a9f4614da
d91acaba1a