Merge "Fix issue #8032572: Android app permission help text "null"..." into jb-mr2-dev