am 2209abf6: Merge "Remove OptionalPermissions demo." into jb-mr2-dev

* commit '2209abf69495283225d5daf0e8b3fae5cfa9b02a':
  Remove OptionalPermissions demo.