Merge "Add --retained option to ahat" am: 7f7f9d3991
am: 780a010df3

Change-Id: I74da735b0d7b0ba7b2cf7c35f809f64adf74f41c