am cf633a4c: am 6981f11f: am 2253105c: am cab09cfc: am dc9efbbb: am a5f4e79f: am 22a946d3: am 006119bf: Merge commit \'8237dd82\' into manualmerge

* commit 'cf633a4c45b344ccb3f844afc6f6e0883cc5db83':
  DO NOT MERGE Fix issues during backport