Restore name to equal artifactId for parent
Restore name to equal artifactId for parent

Change-Id: I3b1eb36f5da5a6e49d6e83d1f3873f5eac6cba0d

toliaqat/xenon,toliaqat/xenon,toliaqat/xenon,toliaqat/xenon,toliaqat/xenon