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

Change-Id: I25447edd4c22c7df4375f88b904d1300555a3836