Substitute id generator for superior UIDGenerator

Change-Id: Idd57202e961cf1ac8a97776980daf1165211cd23
Merge "Substitute id generator for superior UIDGenerator"