Merge "Make RawAddress into a class (4/4)"
am: 1bd5a3ff87

Change-Id: I71e7ef4a55a3dd570ec6f5056190493e3bb85168