Merge changes from topic 'move-hwc2on1' into oc-dev am: df8ca52d13
am: 4edd1b49af  -s ours

Change-Id: I0bc5acd7fbf8c5e37b54bc30740e6a1e3ad966f0