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

Change-Id: I93cc3bee7b254b51ef1376b6644c20f0da5acb6b