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