Merge "Update accessibility to be encryption-aware." into nyc-dev