Add FileProvider

Change-Id: Iddde2458c4eddc97f5f8c2febf632cc6454086e0
Merge "Add FileProvider"