Merge branch 'stable-2.12' into stable-2.13 * stable-2.12: Cancel periodic cleanup task on plugin unload Remove source_under_test to comply with new BUCK version Change-Id: I0d4f1a0bc274b3f58f1fdb1f8d9dfb8d1bfa46e2