am 9092b530: am fae6eb7a: (-s ours) am 5f1aa33a: am 44bafdcc: Merge "DO NOT MERGE. Example code for FileProvider." into jb-mr1.1-ub-dev

* commit '9092b530518437d1f51fbd73e4cabf9666e8035d':
  DO NOT MERGE. Example code for FileProvider.