Merge "Fix boot on sw600dp devices."