Wild kanging from n7_hardboot.diff revision_2