Add bay uuid to Service Objects

Change-Id: Ia8b757d5bbe477c2de09b65f35409847fd1623c3
Merge "Add bay uuid to Service Objects"