Updating credits

Change-Id: I2e2c3c9aa033cbf18891208245199d30232aea96
Merge "Updating credits"