Merge "DO NOT MERGE - use appropriate names on SQL numbers in 'adb bugreport'" into gingerbread