am: 077534b1 * commit '077534b1': DO NOT MERGE : backport of backup transport whitelist Change-Id: I04041486cfa35b534915a25cd1d84442a59ed7bf