Merge "Improve KeyChain documentation" into pi-dev
am: 843a0cabbf

Change-Id: I85870248f4cfa44f96f351b0a18e5ef5780cbbf6