Merge "Rename SETSUSPEND to SETSUSPENDOPT DO NOT MERGE" into gingerbread