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

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