Merge "Merge "Make RawAddress into a class (2/3)" am: 31e94c57e9 am: 220751b48f  -s ours am: c4a85d431d  -s ours" into oc-dr1-dev-plus-aosp
am: d391abb36c  -s ours

Change-Id: I441c2bdc1239ad66b8df07e1bd5a6601106efd23