Merge "Optional <uses-permission> not yet supported." into jb-mr2-dev