Merge changes from topic 'o-compositor-unification' into oc-dev
am: 0e04fe4713

Change-Id: Ie819585288871279d6de56290c7939b1c9ab63aa