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

Change-Id: Ie1c48c13a8860ede34f4f2ecf21fdcf33628f310