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

Change-Id: I9634dbd364ff6e36cf6a4f33d0b9efacdb5d9b02