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

Change-Id: Idb582d40556504d8ba4e52b94f24f354d27cbc03