Merge "[Map] Upstream sync (r66413, r66459)"