Merge "Hack to get devices booting again." into mnc-dr1.5-dev