Merge changes from topic "am-378c0e35e9684629b3aaf25a9a265a52" into oc-dev am: b561ef8553 am: 9bf3c6e006
am: 6f47dd957f

Change-Id: Ifd6d05cb5c3963f2cdadcefc1ba0672b5fe4a6dc