Merge "Revert "Move tests to postsubmit to reduce lab reporting load temporarily""
am: fce60b7f40

Change-Id: Ie00524459af269d6af577d82731f12281da85d24