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

Change-Id: Ib50760a9ac60e4f72faee4551f36b123446a1dbf