Merge "Use GC critical section for profile saver" am: ff120c2ad8
am: 2d582600da

Change-Id: I851363798c62a16c437893830c20d81c300ca83a