[13508] Update for gradle build