Merge changes from topic "am-9fd37bbd-f227-4135-a674-78c7ef1f0468" into oc-dev am: bc7da75f am: 8c06bfb6 am: 77a8b4d7 Change-Id: Ia23aef867a97767f9800481cb3747b7ff5ba053d