Merge "Granular navigation uses mContentDescription instead of getCpontentDescription()s" into jb-mr1-dev