Merge "Change type initialization entrypoints to kSaveEverything." am: 1c66504e06
am: 4850238ed1

Change-Id: If14ca6c3c9eea0382dfc5c587cf612256de5058f