Merge "Avoid redundant overwrite of value in TimeSparseArray" into udc-dev