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

Change-Id: Icc36fc479289b517ebe2d591506f1c5f30425154