Merge changes from topic "am-8a5b86f8-be8c-4062-afcf-d631975ceb6b" into oc-dev am: e634ca4e am: d96c5d9d am: cab4653c Change-Id: I21b7b0213d8a55ce7295790c461cebe2acde5439