Merge "Rename the newly added maps variable to be more descriptive" into main