am 0fe43c9a: am fc76ddd0: am cda53c5d: Merge "Fixed a bug where the ConfirmDeviceCredentials activity was shown twice." into mnc-dr-dev

* commit '0fe43c9aec51d6389aa3e6943190a75a62b641be':
  Fixed a bug where the ConfirmDeviceCredentials activity was shown twice.