Merge "Merge "Add Record Dalvik annotation" am: 29289e69e3" into main-plus-java-next-dev