Merge changes from topic "am-00ffb4de-7aa5-42a4-ba5d-b45278438ff9" into oc-dev am: 283b2bdbd9
am: 48a2b53c5f

Change-Id: Ifa7a8217437a58b61c6af3611a77a8b17a672072