Merge "Prevent OPP from opening files that aren't sent over Bluetooth" into nyc-dev am: 159bb07e8f am: 3297f727f6
am: f264af88a8

Change-Id: If65eab1ca7f9409fc47b522df8be6a05e73e7878