Update comment and db selection

Change-Id: I08c1437d58a7811f784a068012de5018b82f0c09
Merge "Update comment and db selection"