Merge "Merge "Make RawAddress into a class (2/3)" am: 31e94c57e9" into stage-aosp-master am: 2063592cd2  -s ours am: b33f33875c  -s ours
am: ebe7f8f32e  -s ours

Change-Id: I091eb9797195f65cdda34244dc817e01b79d225b