Merge "Fix broken image writing on some userdata configurations." am: 3110fcacff am: 8cf9ba16c7
am: 21e755a9c3

Change-Id: Ibe74ff6429b014da128d091faf5ad1b96454b648