Improvement first release Datastore Candidate

Change-Id: I44537ab5e130ef115c5856c3ce464fcd65d85c0a
Merge "Improvement first release Datastore Candidate"