Merge "bring database code in master for 'adb bugreport' in sync with ginger"