Merge "Fixed Sonar issue in SubDelivery.Java"