Merge changes from topic "am-99e79364-ab71-4d96-8a34-000c07c66d3e" into oc-dev am: abf0ff542a am: 4d58eb3bc1
am: e388855c62

Change-Id: Ifc6bb00979b4390f099b9c169843a47f94a21235