Merge changes from topic "am-9fd37bbd-f227-4135-a674-78c7ef1f0468" into oc-dev
am: bc7da75f87

Change-Id: Ibdf168a787a6208e78afce6ee311cfd84b198c4b