am d392646b: am e848f6b2: Merge "Fix cts-content testdef." into eclair

Merge commit 'd392646bfb9e52b1ec390ba1683cfdf1cc396c71'

* commit 'd392646bfb9e52b1ec390ba1683cfdf1cc396c71':
  Fix cts-content testdef.