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

Change-Id: I6aed664c87cff1c24a2d4eb15016a2a1d14aedb6