Merge "make USER limited to 6 characters when generating BUILD_NUMBER" am: e9430e2361
am: 71aaa02533

* commit '71aaa02533a5a4c91bb360d4f5cfa9d11dc2c160':
  make USER limited to 6 characters when generating BUILD_NUMBER