Merge "Switch from commit() to apply()." into sc-mainline-prod