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

Change-Id: I4940ae77f7e334c4784c2ce35ef8588317b6e9a0