Merge "sed -i run as root wasn't preserving ownership."
am: 20197847d8

Change-Id: Iced27bcf61a099b91b060a370a319bf58987638a