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

Change-Id: I7847df1666f06c5953680e59ba40b9ab005a4b75