Merge changes from topic 'move-hwc2on1' into oc-dev
am: df8ca52d13

Change-Id: I54fd4fe69160540a0f0eae3a9b6aa7a377448cd4