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

Change-Id: Id0967500ae42be23075cebed5c2640830dcdfb8b