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

Change-Id: Ibbc1c8a17c51cda2797d4acb8b66ad6672011919