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

Change-Id: Ia45a953260551eb12d027096912cd678070d2ce1