Merge "Fix capitalization" into pi-dev
am: ee7b704c9c

Change-Id: I98aec0ddbd83d78bf7775077c013fe2d9b7956be