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

Change-Id: Ia17cafcadb78754e4f317023ef28bfe87ec67d74