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

Change-Id: I55ffc52b317a94b800de0107cd0c6eef118fc328