Merge "Fix the VectorDrawableSizeTest" into oc-dev