Merge "More concisely export whether we have a "tetherable configuration"" am: 1b2a1b91 am: 72c17a72 am: d0867fb8 Change-Id: Iba07ae91906fa2f0763dae831f56b4841572e1f1