Merge "Set the per test timeout for the AJUR from CoreTestRunner" into nyc-dev
am: 76054d7dba

* commit '76054d7dba5fde1baff883cdb41e6a22681c4212':
  Set the per test timeout for the AJUR from CoreTestRunner

Change-Id: Ib1d9e344a5539d76c478d0adced8cd023b2a13ff