Merge "Make RawAddress into a class (2/3)" am: 31e94c57e9 am: 220751b48f  -s ours am: c4a85d431d  -s ours
am: 4749b5765a  -s ours

Change-Id: I61303c97247a8be9cad279d4d458d225bf558889