Merge "Utilize verbose KeyChain errors" into pi-dev am: 8e07a26233
am: f4dfc116a1

Change-Id: I0754008088afc7bd1600247f583f339f2a3a040b