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

Change-Id: I3fc887ca87b96b93989e187abf05b66201d29b95