Merge "Deprecated the resource config_tether_apndata" am: 6522e5d45f
am: 6fb89ba31b

Change-Id: I1e4306c59b5f4ba5b09cc266349d63a3d9b6570d