Merge "Revert "More run-test with Jack"" am: a4811cd349
am: edc8b586d9

Change-Id: I1f200a3ddc8b4cc7dca3784af1edf54cb8ef9958