am 77976b6f: Merge "DO NOT MERGE Fix IssueReporter Bugs" into ics-mr1

* commit '77976b6f6ed3b7617de983ef3d4acdfd90c4f10f':
  DO NOT MERGE Fix IssueReporter Bugs