Merge "Fix ConfirmCredential is not presented before trusting cert installed by PO/DO" into nyc-dev
am: 090b5a8e8c

* commit '090b5a8e8c6cbe069c9818eda25b1976da6426a9':
  Fix ConfirmCredential is not presented before trusting cert installed by PO/DO

Change-Id: Ia5afd41dcadc0b43c92061eefa111c168857ef32