Merge "Use GC critical section for profile saver" into oc-dev
am: 75e7933a3d

Change-Id: Ib91fd07b54fb44afc6cbce62efc63eb73d38899d