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

Change-Id: I515b295616a1875f2e75d006f1b723185d3250a0