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

Change-Id: Iba4aba8833f3543d8e28c5d469667bbeb09b860e