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

Change-Id: I59a6064e440aa517ce5422c8f84ba93e81606fd0