Merge "Update the get_process_name call." am: 7a723567f4 am: d8bc1d3bb2
am: 5b2472a373

Change-Id: Ia80656ce1e5314c854d88cd5be4735d3f4964816