Merge "Remove reboot_data_file." am: f3f194c09a am: 9cac761df7
am: 17491f6b9c

Change-Id: I32dfe7fd082e3d7a60f0787f2c0d559d8ce252c0