Reduce rollovers of unique ID generator

Bug: 28119934
Change-Id: I6c57d5555f6c5ddc4d4eee1e6f27fc4aaeb31c83
2 files changed