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

Change-Id: Id724a10c23afc2fc9f1ac5eeef7853ec6b40a417