Merge "Add 'exclude parent' option to debug." am: 7fb0aa5f97
am: 078d9bb83e

Change-Id: I77bb58878b489edc94216fd3e1054d6151827c5b