This reverts commit d64901494f. Reason for revert: b/123636344 Change-Id: If6307935ba3613cb24f5bab2234febef83c6f7d2
d64901494f