Merge changes from topic "am-3ca94091-64c7-4524-a9e7-1438a5fc6599" into oc-dev am: 41ae4b7eae
am: 6c1ecb973c

Change-Id: Ie305f8b8f404f9dcf19f53d51fca7eafed03faaa