Merge changes from topic "am-95ed1a42-c734-497b-9e03-f8de9f42ea61" into oc-dev
am: eb92e99a06

Change-Id: I770dac967bc946a9c89550989057bb99f8a213fd