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

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