Merge "Fixing typo in proto field." into pi-dev am: ce9fe591ac
am: 9b68c7aa9e

Change-Id: I24ed8f1ec83e6539a12a8cd04068a9d2d31886cc