New drawables for the update to the maps API (DO NOT MERGE)

Manual merge from master.

Change-Id: I97ad9daff6036e5c7b9e946b53191574c8b0b6ed
2 files changed