Merge "More concisely export whether we have a "tetherable configuration"" am: 1f2437c65a am: b0949a3ede
am: e7234fc716

Change-Id: Iba07ae91906fa2f0763dae831f56b4841572e1f1
tree: 198db29ea5a6e00e7f9d62296a33a3112880e66e
  1. core/
  2. services/
  3. tests/