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

Change-Id: I7dc72e901d4abcebc7b53e6c9aaa24cb774f2f59