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

Change-Id: I42136064a8ef7339fdb3c2b0bd18fc6693219d09