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

Change-Id: I146d209c06a8975f5be4d26e808d8a85106f446c