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

Change-Id: I44615ca48d7191056b7999cbe41498b56256a320