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

Change-Id: I22d2f9572297bf648ba4842fc5b23b539e757fac