Merge "Fix fraction and dimension type in Resource.proto" into pi-dev