Merge changes from topic "am-2cc1b50f-d7fa-4824-840a-51adc851b2fa" into oc-dev am: b59324afa1
am: bf7981bf90

Change-Id: Ib3e91f95f6bb6cde1c65be0d3cd9a9e3b45b0e7e