DO NOT MERGE: revert HWC2 changes
am: 9cc83934f9

Change-Id: I05491808727e9de5a066cda6887680c61838a932