Merge changes from topic 'hw_bitmap' into oc-dev
am: 4e73123c52

Change-Id: Ic202387c7fddcf6cc87024812c112e5ce3a4ab7b