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

Change-Id: Id5a47be0a8b28860daa8e68913edc4452c696c10