am e12db0b2: (-s ours) am bec459a2: am 480bea33: Merge "Add top level sanitize options for ADB."

* commit 'e12db0b2011fc0a678f093653342c0d5ecf4272a':