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

* commit '629fb90a76089c81711b0ff7737ba18168f29890':