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