Change id generation

Change-Id:I1ee169907c09bfa7fb0ec57c6db77f3ae3fcea6e

Change-Id:I1ee169907c09bfa7fb0ec57c6db77f3ae3fcea6e

Change-Id:I1ee169907c09bfa7fb0ec57c6db77f3ae3fcea6e
Fixed the DaoImpl merge issues

Change-Id: I91d1f6fb797605b508897607b2b45f426d108408