am a9f3c15f: am 6167671b: Merge "Reenable tests that currently pass in CTS"

* commit 'a9f3c15fa77a67f69c2ec0a058b057391a276bda':
  Reenable tests that currently pass in CTS