Merge "Use named constant instead of magic number in RegisterLine"
am: a03627a94c

Change-Id: I2008812caf6c60340c17d1b43334a4a257dca215