Changes corresponding to bug=57038