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

Change-Id: Ie8550c62dbaa9bc20b8b995a77c633a907e25fbe