Merge "Update RS CTS to check API level 16."