am 7ef696b6: Merge "Temporary workaround for NetworkOverLimitActivity dialog." into lmp-dev

* commit '7ef696b6ed662abf1066f33d293ccad6f0808126':
  Temporary workaround for NetworkOverLimitActivity dialog.