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

Change-Id: I619d560145d6d4058be35de74bc4ded503da455e