Merge "Properly handle empty map after read-only map." am: 8bf4e29e44 am: 0dd7ac6cd0 am: 813d1b562d

Change-Id: Ic2e36274bef55d3a7b1f639b9d5ff8ef3faa19e2