Merge "Couple fixes to HardwareBitmapUploader."