Merge changes from topic "am-b13a1f4c-8656-492a-ba4c-6b204a543b93" into oc-dev
am: 695442be2d  -s ours

Change-Id: Ic06c41b6fc586e2159b140f2b92d27c830616be9