Merge "Fixing copyright markings that are wrongly updated in commit : Id9a886e17838b9a7c21c57e892f2d8eea20f9ab2"