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

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