Merge "Don't truncate ${USER} when generating ro.build.fingerprint" am: 8543feae1d
am: 8b182afa9b

Change-Id: Id5766dd1774a122c469afc45595b0451a2e189f0