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

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