Merge "Manually merge 23bb5bf262279ab37cfa109091c1bf0ae75e0685 to fix APIs"