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

Change-Id: I0284ac97f01fcd6c0dbf749b5a93a8ba455f777f