Merge "Pass down more profile saver options to the runtime" am: b1b1204a7a am: 83ee6f1b35

Change-Id: I6167809cd27c7a26cf4e3cd290a3eb7ab479a2f7