Edit: - Add name to credits - Add entry in manual Change-Id: I0e0b062e001ae9134db3ee6e4fba21e93ddd04ee