Merge changes from topic "am-25c8f1dd-79b2-410a-8aa9-2fe914e32aa3" into oc-dev am: 1825d87bc7 am: c270ca1086
am: 1eaac3c4bf

Change-Id: I5c06fc9693a898e3573d5ac751434bf558cc84a0