Merge "Fixed annotation typo." into pi-dev am: 74896e21a7
am: e4c2d3c5ce

Change-Id: Ib098e9eb01551c303ccb9c4ddc3c2ab70c769010