Merge "Add hooks to avoid collecting code for run-tests."
am: 69dcdead8a

Change-Id: I541b4040b6e1720f4445794ddf24b3243e59e870