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