Merge "Make RawAddress into a class (2/3)" am: 31e94c57e9 am: 220751b48f  -s ours
am: c4a85d431d  -s ours

Change-Id: I8d83054faebe4a1b63976abb780111d2aedfe684