Merge "Merge "Updating logging for possible edge cases of incorrectly updated arrays" into udc-dev am: bfca1097e8 am: e644ed4428"