Merge changes from topic "am-06853e6c108343be9f3dae60afe35875" into oc-dev am: dfa865bf3c am: 86aa5bca0f
am: 162d0c7a61

Change-Id: I326f0d38ad09e88935cb4666bac711eb325c0d83