Merge "Add Error specifiers to the API." am: 4c4a55a67b am: f729fccde9 am: 65030630fd
am: 84c1ff86f6

Change-Id: Ie7ee3cdf9fa2a75a88f68c5fe7d7c4e28d91b549