Merge "Remove the divider" into pi-dev am: d119530976
am: b0cf8a6ea9

Change-Id: Ib07759e3269788d8b406aab1581893c188a43626