Merge "Change database package name align with the directory name" am: bd6b6a6284
am: 9cf2f03633

Change-Id: Ia8daa78cdcf2516c4a077424b21c8c3c43f4dfcf