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

Change-Id: Ic67b2d4589f586c67109216330f68cb1fc08c55a
tree: 846172aca5e949e90c37ee4d46d6cd646b79982e
  1. core/
  2. services/
  3. tests/