Merge "Backport of backup transport whitelist" into mnc-dev am: 2cfc6baa22
am: 600d4f61ca

* commit '600d4f61ca15b375c9acef64d52913f0ab823deb':
  Backport of backup transport whitelist

Change-Id: I308a0f0284990dc8e327c581cac49db899ad6cfa