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

Change-Id: I6787b8eb99e9384e9a207d4f64159c5ac60ce534