Merge "Improve annotation and javadoc for set/getTransportType APIs" into main