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

Change-Id: Ibc1353bc083cf035df4e0d89ba4aae189b90c84b