Merge "Remove testdex version." am: e01c2851a1 am: 8c1d6eb45a

Change-Id: Idb37db3e007702748c63b924eeeecb52e1522b36