Merge "Remove "Bootloader" reboot option" into cm-10.2