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

Change-Id: If7d1dcb20679d73cedf44e361790298abbeff990