Merge changes from topic 'test-hwc2' am: 29943c1971 am: 92360b14a0
am: d47b3c13da

Change-Id: I616fe5646001c45933d466ee77824dc435819c5b