am 22902f54: am bec23ea9: Merge "Preserve CTS fail behaviour on null bundle...
am 22902f54: am bec23ea9: Merge "Preserve CTS fail behaviour on null bundle for old API" into klp-dev
* commit '22902f54':
Preserve CTS fail behaviour on null bundle for old API