Merge changes from topic 'LOHSapi' into oc-dev
am: 3ddc413b73

Change-Id: I35750976e1f34c1195c109863f9deb988f7e42ef