Merge "Update java doc for correct rotation of thumbnail from Q"