am 22a946d3: am 006119bf: Merge commit \'8237dd82\' into manualmerge

* commit '22a946d36af4ea69956531c89f0d0852497c3892':
  DO NOT MERGE Fix issues during backport