Merge "Make PHPCS pass on JsonContentTest"