am 4e45d392: Add certificate to keystore for the ADD intent

Merge commit '4e45d392ada4e84fbeed06874caebfd3c7759073'

* commit '4e45d392ada4e84fbeed06874caebfd3c7759073':
  Add certificate to keystore for the ADD intent