Merge "DO NOT MERGE - Create db path if it doesn't exit" into gingerbread