Merge "Add Error specifiers to the API." am: 4c4a55a67b
am: f729fccde9

Change-Id: I91d077af7f001853df99d4ae4ba7da611c1dea09