Merge "Fix failing accessibility CTS tests." into klp-modular-dev