fix the wrong order of steps and missing password in db connection

Change-Id: I5f7f8c3d97af76123ba6344ec013abedc38a539a
Merge "fix the wrong order of steps and missing password in db connection"