Rename an argument named "register" to "reg". am: 334a5a386c am: 8e6124d263
am: b564d65f31

Change-Id: I62c10dc24c11b4bd523a8500f7ad66264e60197f