Merge "Fix adb bugreport and add bugreport unit tests."