Merge "Document immutable requirement of SharedPreferences return objects" into jb-mr1-dev