Merge "Make RawAddress into a class (2/3)"
am: 31e94c57e9

Change-Id: I7991262e2c1b8b1c48e6eda5373ac608f0ed845b