Merge "Make DropRootUser more container-friendly" into pi-dev
am: 0a8c8f5399

Change-Id: I2d8c32f1513dbe4de5cc20f425bf450dd6387002