am b82b3b57: am 3e9cba4f: Merge "Deferring size callbacks until boot completed (issue 7469267)" into jb-mr1-dev

* commit 'b82b3b5754305c36cfeb7c87816110da3c7b2ff4':
  Deferring size callbacks until boot completed (issue 7469267)