Merge branch 'upstream_master'

Conflicts:
map/MarkerManager.java