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

Change-Id: I755cdfa2f0e7cde601983be448a6ebb2eb0083f6