Merge changes from topic "am-27943b02-3710-49e4-84f6-eabc78fdbe01" into cw-f-dev

* changes:
  [automerger] Don't pad before calling writeInPlace(). am: 732132b7 am: a6a5c3fa am: 325909a4 am: 953b08b7 am: 32da4bbe am: a0139728 am: 6fccb21c
  [automerger] Don't pad before calling writeInPlace(). am: 732132b7 am: a6a5c3fa am: 325909a4 am: 953b08b7 am: 32da4bbe am: a0139728
  [automerger] Don't pad before calling writeInPlace(). am: 732132b7 am: a6a5c3fa am: 325909a4 am: 953b08b7 am: 32da4bbe
  [automerger] Don't pad before calling writeInPlace(). am: 732132b7 am: a6a5c3fa am: 325909a4 am: 953b08b7
  [automerger] Don't pad before calling writeInPlace(). am: 732132b7 am: a6a5c3fa am: 325909a4
  [automerger] Don't pad before calling writeInPlace(). am: 732132b7 am: a6a5c3fa
  [automerger] Don't pad before calling writeInPlace(). am: 732132b7
  Don't pad before calling writeInPlace().