Merge "Avoid saving result from WeakHashMap.size()" into udc-dev