Merge "DO NOT MERGE ANYWHERE: Hack to get devices booting again." into mnc-dr-dev