am: c69aa838 * commit 'c69aa838': Backport of backup transport whitelist Change-Id: I0151279dfa467d6f456c2cfb4066cbc2ff4f7365