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

* commit '56065891abf383b0409ae595437dcb0ea132e32b':
  Do not always call setIsConnectedToProvisioningNetwork(false)