Merge "Fix copy / move behaviour of Maps object." am: 30c898f1ca am: 7e345a00a1
am: 449355f920

Change-Id: I4cf3802f650a22bbf56ebdf1c87253a402b21aa6