Merge "Fix ConfirmCredential is not presented before trusting cert installed...
Merge "Fix ConfirmCredential is not presented before trusting cert installed by PO/DO" into nyc-dev am: 090b5a8e am: ae8177d1
am: 25c0ba01
* commit '25c0ba01':
Change-Id: I4761d760223fa7e940437da32521b3a6f149c6b4