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

Change-Id: I2060431ad2e0bc5f2858771e4a9281719ac5ebea