Merge "Prevent PHPDBG from issuing notices in unit tests"