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

Change-Id: I69fdf5bf2ff8f2c454e2e1a455e4d8d73b330aa3