Merge "[Maps] Fix build warnings"