Merge "Deprecated the resource config_tether_apndata" am: a97f8b3998
am: bbcc1ae0f5

Change-Id: Idb6aaf27b249748b637b3a89e3c5fb91feb59938