Merge changes I758270b8,Ic08b2b06

* changes:
  Adds --force-queryable option to adb install
  Revert "DO NOT MERGE: Adds --force-queryable option to adb install"