am 08ffcb99: am 227ba29e: Merge "Clear only keystore credential entires" into mnc-dev

* commit '08ffcb996e5a54cf127e2ab87ee6689c23e0177e':
  Clear only keystore credential entires