Merge changes from topic "am-af991497-a243-423d-8f58-f6bc1131a734" into oc-dev am: 6e30a00c96
am: f45dbc6a69

Change-Id: Ic7d8a8dd5cff126f9995ba9aa3e1158d724e4403