Merge "Update AllTests to actually run more of the tests"
am: 92efcfdc7c

Change-Id: I273e4f66bd4277dad93a9c3749cee13097b15b1b