DO NOT MERGE: revert HWC2 changes am: 9cc83934f9
am: cc9d296ff7  -s ours

Change-Id: I52f4dbe4f6a36d5ea99a9b216cfa099e6a9793f8