Merge changes from topic "am-59fcdedb-d1d8-4894-bcee-75f4085aa930" into oc-dev am: 57b2e38837
am: 6c2376ce80

Change-Id: I98b7dd583ff252187b364c2e074493374e7392b4