Merge "Merge "Make RawAddress into a class (3/3)" am: 81e9716c" into...
Merge "Merge "Make RawAddress into a class (3/3)" am: 81e9716c" into stage-aosp-master am: 6aece753 am: 9e026189
am: 7c9d1acb
Change-Id: Id886185841de3e0955b4786c54a539086e1736e7