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

Change-Id: Ic69818ca8e001af50599ba73a7a1ef0b40f29b9c