am f0857005: (-s ours) am db86c59e: New drawables for the update to the maps API (DO NOT MERGE)

Merge commit 'f0857005b25c59b0135977b5d869be16232a1e50'

* commit 'f0857005b25c59b0135977b5d869be16232a1e50':
  New drawables for the update to the maps API (DO NOT MERGE)