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

Change-Id: Iee40ba119988f964dc86ea603a64044f7d0e20e3