Merge changes from topic "am-3142fca9-100b-4dd4-8848-117761166ffe" into oc-dev am: a86ba9b6e5 am: 7c05674594
am: 08f437f2b4

Change-Id: Ic6c4b5b73064e6e1a0fa1e113caf3c638f09ae5d