Merge "Add support for getting a dex pc." am: 5e5056c5a5 am: 4e57346a75
am: 9a0acd254b

Change-Id: Ia65d2ee31f4aa5ec819b0d11b450defcc8208c96