Merge "Fix system-as-root detection on Pi" am: 60d31dd2f3
am: 0dc3de8f00

Change-Id: I470a121793410629b5328c3eee4d7d6f506ba66a