Merge "Cosmetic changes to suspend_private.h"