This reverts commit e1de284a. Reason for revert: b/115639644 comment #27 Change-Id: Icf1f067b4d8f6b83be86128f07a89608112cebeb