Revert "pulling db1004"

This reverts commit b45260165a54adeabc6a8521b56bcaed399e9628

Change-Id: I782bb80b25de567a4a558792aaad33170e051b82
Merge "Revert "pulling db1004""