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

* commit 'd201f486871e825e713ae0df2f2f01e3dfff94d8':
  DO NOT MERGE ANYWHERE: Hack to get devices booting again.