am bec23ea9: Merge "Preserve CTS fail behaviour on null bundle for old API" into klp-dev

* commit 'bec23ea922566c4b1656deffe1b1951575ae923f':
  Preserve CTS fail behaviour on null bundle for old API