am 86ad8e68: am 56065891: Merge commit \'53221120\' into fix-merge-conflict

* commit '86ad8e6871e778e1ee47d4f723bbd1d5f8fc00bf':
  Do not always call setIsConnectedToProvisioningNetwork(false)