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

Change-Id: Ie840bd1f24e3763d0fcce23ce439e3d4be64e896