am d5e2b00c: Merge "Workaround for running out of address space on N7v1."

* commit 'd5e2b00cbc1e6b6608a5dbcfb05b7c4976614636':
  Workaround for running out of address space on N7v1.