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

Change-Id: Ic3b3090afd781b0d61395420132f9d0397183691