Merge changes from topic "am-d1fbdf53-dccb-4215-99ff-b24698b6bec8" into oc-dev am: c6c61129 am: b2f28267 am: 8d249b91 Change-Id: I98106dea821a12efd704adc279212136971f76bb