Updated credits

Change-Id: Idc1f79580a9cd3b17763af3cbe58665feddcef71
Merge "Updated credits"