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

Change-Id: I5a755be59192475ed9b60dc29d18a581812b56ce