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

Change-Id: I162cf55d93be65b7455b2f83492489993d6da7d9