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

Change-Id: I08ab5c1aa1a0a6550c310e9be6bbe3d135f3795d