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

* commit '227ba29e3947c8d53cb4a8138f0c3f209ae414e3':
  Clear only keystore credential entires