Merge "Clean up register line"
am: f598e2f183

* commit 'f598e2f183f496065597267a6fc142aa9a56e7c4':
  Clean up register line