Merge "Add extra timing loggers for image writing" am: 8179b624fd
am: acb119d5f7

Change-Id: I069c5695132ca7ef458a3f7d13a24885bc1d038a