Merge "Docs: Editing SDK java docs" into nyc-car-dev