Merge changes from topic "am-f1c23412-1f54-4840-90d6-b3eb7b06fc83" into oc-dev am: 59f13cbb8a
am: 34d73a6f77

Change-Id: I92656bba49935224c4b97c8c36aaddeaf7360950