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

Change-Id: I37a9727fb3851052b9eab2e1a8fad9a7569d6986