Merge "Hack to get devices booting again." into mnc-dr1.5-dev
am: 29700949ad

* commit '29700949ad981bde8d35219914161f6424e7757b':
  Hack to get devices booting again.