Merge "Fix fraction and dimension type in Resource.proto" into pi-dev am: 1a12311433
am: 4dcb9b082b

Change-Id: I5068164f7904d21b3de56be20c37092faac751be