Merge changes from topic "am-9e4fa925-b00a-40e6-8fb0-e5a4244e6284" into oc-dev am: e43837e2 am: dccb62bc am: 64cb4be8 Change-Id: Id7d4599c5d7d7c803e86afa88be582773c80741f