Giving people deserved credits

Change-Id: Id7e93e804838ce5559f650d003dc22da5858427c
Merge "Giving people deserved credits"