am 8e39c796: am dbfa611b: Merge "Fix inconsistant results for some cts tests."

* commit '8e39c79622b79f4b5faf53123acefa5c5bda5eed':
  Fix inconsistant results for some cts tests.