Merge "Clarify usage of context in the JavaDoc"