Merge "More concisely export whether we have a "tetherable configuration"" am: 1b2a1b911d am: 72c17a7234 am: d0867fb876
am: 1a816ce119

Change-Id: I290df5269739bc7fb5ebc8614a96c38bf7faf367