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

Change-Id: I93de9ffe3bb427533865e0d1733068661a0d209f