Merge "Merge "Make RawAddress into a class (4/4)" am: 1bd5a3ff87" into stage-aosp-master
am: b48a8a219f  -s ours

Change-Id: Iae4f57534852af650b5c7861286e4be4c851196c