Merge pull request #18994 from totten/master-ang-json