Merge "Disable ContentService.DEBUG" into pi-dev
am: 190080537c

Change-Id: I10e32b3a060e0f667e3c4d7bb4a876d498bdab34