Merge commit '8190f485539c36803489dcf5f198d03ed87ae8f9' * commit '8190f485539c36803489dcf5f198d03ed87ae8f9': Minor changes to ContentProvider javadoc to improve consistency.