Merge "Implement maps parsing." am: 33e6b18d35 am: d58265e72a am: f6defd3e09
am: 328b6947d0

Change-Id: Id652cabecede1d9cb3fbda0d97e8895c43d3d2fe