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

Change-Id: I34809b7775652fa23e145a73647b67292f41f10e