Merge "DO NOT MERGE Temporarily rename the package name of BugReportApp"