Merge "Don't let callers OOM the system process." into pi-dev