Merge "Docs: Fixed info about spanning multiple columns" into nyc-docs am: ca7eee3d11 am: ab35b73d1b
am: 790aa26f8c

Change-Id: Ibe45d6d209990d1484421649a935125625bdb6a7