Merge "Clean up register line" am: f598e2f183
am: 7dc6c62b68

* commit '7dc6c62b6819c51deb7f8e1e58ba94ed361a3798':
  Clean up register line