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

Change-Id: Ib4f1e1f94904c2549162ae4779634540dad08078