Merge "Reenable optional permissions parsing and expose APIs" into jb-mr2-dev