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

Change-Id: I04a55e2251077fff704ce8d0568b4417ceaa1299