am 63461e61: Merge "Bump mms whitelist time up to 1 minute." into mnc-dev

* commit '63461e61b9aba2514fb39f87b8741b6db1f7e5d7':
  Bump mms whitelist time up to 1 minute.