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

Change-Id: Iddef019195dcf571656b68e00dd245b2db6cb812