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

Change-Id: Ia517fe617338161966a6ee389d18526e8e2c7bc5