Merge "Fix Instrumentation_ActivityMonitorTest." into pi-dev