[automerger skipped] Merge "Do not destruct static maps." into qt-dev
am: c1e587fb8d -s ours
am skip reason: change_id I66eb9aa24e31d7fc652f0426361c17600b4716ec with SHA1 b1c7d06b1f is in history

Change-Id: I0dba45ab0e84b510391a4f28c3f796ad63d2eb9d