Merge "Specify per-file owner for dimens_car.xml"