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

Change-Id: I4c254f62d08a969ee20ade8791e45c9eb97d885c