Merge "Implement new DEX PC lookup scheme." am: f1e55f7a99 am: c3aabea0b1
am: 0b9aed7ba6

Change-Id: Ibaf9bf2935c613032a57399ef34b6c302bec0812