Merge "Update ECP contribution for Photon M2"