Merge changes from topic "am-2fb1f972-9bf0-4533-a368-402725bae81d" into oc-dev am: cfefca44b0 am: 6f0501b853
am: c15279ab8b

Change-Id: Ieb382a089c71a09b565f52573f0a08f1f41d0feb