[automerger skipped] Merge "Change database package name align with the...
[automerger skipped] Merge "Change database package name align with the directory name" am: bd6b6a62 am: 9cf2f036
am: 1119db92 -s ours
am skip reason: change_id I2b6b1ce1b67eebe289fa3c8153fd296b1ee8cf19 with SHA1 1c69726c is in history
Change-Id: I4171f7a73bb1d1bda1b8a88efd6f471edd0cc480