Merge changes from topic "am-93ef86f6-d908-4917-b503-5ba7fcefcad8" into oc-dev am: 5667f966 am: e2790f5d am: 7ff9dcf9 Change-Id: I7e950f2a72af3be5b030909b025749e3797763c9