Merge "Deprecated the resource config_tether_apndata"
am: a97f8b3998

Change-Id: Iba7ca09a6624bdf8bdb414783588fe8704db1d7e