Merge "Implement maps parsing."
am: 33e6b18d35

Change-Id: I1673e501a90c559bc491c929e21bca6f6cec3a22