Merge "Allow the kernel to read staging_data_file." am: 938d0c2bf6
am: 0fc85c1535

Change-Id: If5f5ca1dfc607f3e15b366309c05f8b3c1bcdfd4