Merge "Merge "Merge "Make RawAddress into a class (3/3)" am: 81e9716c" into...
Merge "Merge "Merge "Make RawAddress into a class (3/3)" am: 81e9716c" into stage-aosp-master am: 6aece753 am: 9e026189" into oc-dr1-dev-plus-aosp
am: 02a83075
Change-Id: I16a559bed2b1518618350115d13673e3f6e12616