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

* commit '795e53a36b0bda3555e23ea8b54cf97361014a24':
  Hack to get devices booting again.