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

Change-Id: I6baeb8014228b9faba0be901935b6dd25e7cd9fd