Merge "Disable ContentService.DEBUG" into pi-dev