This reverts commit cac5c681. Reason for revert: Broke build Bug: 178191941 Change-Id: Idd8d4e3421fe2f9df1165974359fc2f4294a9725