Merge "optimus: fix boot hang, log buffer overrun"