Merge "Clarify JavaDoc for SoftAP APIs"