Merge "Fix typo" into pi-dev
am: 29eec443e0

Change-Id: I745148c2db292e04c3cb25e18969ead8a438b9e7