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

* commit '6d9b0fb923bc6d77b23ac40841625d61eb003e0f':
  Hack to get devices booting again.