Fixed affiliation of Edgar and Sumit

Closes bug 1212953

Change-Id: I33f0f37b6460dc494abf2520dc109c9893ace9e6
Merge "Fixed affiliation of Edgar and Sumit"