Merge changes from topic "am-152b0310159c4cd6bf8d7e87c98040d9" into oc-dev am: 44a6f7b0c6
am: 4668102bf6

Change-Id: I42e71d2b9f76800cbbb6b42ba9169bdf4f9bd8f6