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

Change-Id: I1b91d0d6e5d0319e9887fa665bdff16dd94c85e6