Merge "Initial checkin: optional permissions sample code" into jb-mr2-dev