Merge "Remove OptionalPermissions demo." into jb-mr2-dev