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

Change-Id: I57ae1f1d59d0f2306f1ee06dce52d59c0a3d3ee4