Minor cleanup
Merge from master
Change create*EventTemplate static methods to something less verbose.

Change-Id: I4f0904ff6bef7ce49e97babece440c487c7f9991
Fix some minor warnings.

Change-Id: Ifc74a899a19cbeabc83a8bbb5a2fbcf1d032c06c
Add constants for reverse, forward triggers

Change-Id: I160d192db8c792fb654bb5d80e32014000f49c05
Rewrite QControllerTest for better testing.

Change-Id: I957a1933ca85c1aa2a9873b8be8fdd55270a36f0
Fix uses of deprecated API in AuditionPatches.

Change-Id: I074e9b105dc065e4180b584f9c0f2740e2198b88
Remove deprecation warnings.
Organize imports
Remove unused deprecated method.

Change-Id: I8cf2bb7cbe33b87aed87b005223650019e594bd7