Merge "Revert "More run-test with Jack"" am: a4811cd349 am: edc8b586d9 am: 411fa3cb66
am: 3a9e10e8f7

Change-Id: I72a3aaf36025ad65a12fd013f783c0c0734c619f