Merge "Don't pad before calling writeInPlace()." into pi-dev am: cfa4928af7
am: a85157fc6d

Change-Id: I284c3808fca21625c2441e299fb526cbe9ece8a4