Merge changes from topic "am-922cd235076540bdb5f01e7024397331" into oc-dev am: 889b8f2146 am: efce54b53d am: 6162ba99b7
am: dde7511031

Change-Id: I2d7130d411010a0a0c8cc36d9f50d132aceafe4b