Merge "Remove margin from first line of remote history" into pi-dev
am: dc617e0fb5

Change-Id: I5b1c6fe1c22fe6658959e2dda100b794fe95d6b3