Merge "Use unique_ptr for Maps object." am: 00b2081911
am: 5fd15b8e87

Change-Id: I6c6ff9150ca1d6093531a0d05681b1b30db31d7b