Merge "Merge "Merge "Make RawAddress into a class (2/3)" am: 31e94c57e9" into stage-aosp-master am: 2063592cd2  -s ours" into oc-dev-plus-aosp am: 5d84f45474  -s ours
am: 906bd8da85  -s ours

Change-Id: I378033e20397ccec2f47c56709e31f1cddbd52bc