Merge "[conflict] Merge "Fix array-related errorprone warnings" am: a1eb8cf1 am: 44f85760 am: 91d6c5b5 am: 6a79ae25 am: 9b3a5fc0"