Merge "[adb] Cache features set inside the client process" am: 0e3ed1ce8c am: 5ac5ef2591
am: 5d41a0aa04

Change-Id: Ia54ea464c0aaf9f2e38b9f72b7d256d68ca60a81