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

Change-Id: Iaf13dd261e5dc91f845d31d6cd8a7cab9bbf5e86