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

Change-Id: I78e3603b7fb407788594752c6ca585be535d46e7