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