Merge "Ensure the profile is written to disk at shutdown" am: dae1744676 am: 947b20eac2
am: 18117c3531

Change-Id: I873ce2f09ac1a4f73945fd32ee8820eeea0ac05a