am 0d06152d: Merge "Remove unnecessary allocations during draw Bug #7327799" into jb-mr1-dev

* commit '0d06152d4026e933d8308002e1d53ca4eba6cad2':
  Remove unnecessary allocations during draw Bug #7327799