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

Change-Id: I32fff8fecc01bec75efb5b19b6865c6b14d8fb90