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

Change-Id: Ief662c58d50300e2d91d88f272e89d7dccc3117c