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

Change-Id: I083045d1f78acd89f2bbd19aecaf00a1d9d704f0