Merge changes from topic "am-e418eebc66a1495eb35721b4c8f9d5ac" into oc-dev am: ed520eba4f am: 7cef186f2c
am: 784e6f3bde

Change-Id: I2f48e9051c4be024edd07ceee5ad053dbd91d442