Merge "CallStack: include prefix/tag when unlinked" am: 1476931e02
am: f4e7272d8c

Change-Id: Ie76b171fdab3f74b0942ace337c93b717545550c