Merge changes from topic 'hals-should-use-mapper' into oc-dev am: 0a0e31c42d
am: fd01e4649c

Change-Id: I0bd8a745aaffd198066a482625fe814d97982bf3