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

Change-Id: Ifff670d53d6cbfddac8756f1f7f1352a77528036