Merge "make USER limited to 6 characters when generating BF_BUILD_NUMBER" am: 88ca8aff3e am: 79215cdeab
am: 4c6b66e617

* commit '4c6b66e6172ffcc879ff48f2a245f670471f52e2':
  make USER limited to 6 characters when generating BF_BUILD_NUMBER