% Synchronized to r39471

