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

Change-Id: I31c49889fe71f7d917d40fc4f8f8d48cf159e3ce