Merge "DO NOT MERGE ANYWHERE: Hack to get devices booting again." into...
Merge "DO NOT MERGE ANYWHERE: Hack to get devices booting again." into mnc-dr-dev am: d201f486 -s ours
am: ab4d6292 -s ours
* commit 'ab4d6292':
DO NOT MERGE ANYWHERE: Hack to get devices booting again.