am d978d21d: am 8252b8e4: Merge "Honor p_vaddr if set"

* commit 'd978d21d195976fa3f257b8d17ec2fe18fb436a7':
  Honor p_vaddr if set