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

Change-Id: Ia7fbdf844b5539e41c27a5542f44d2beebc21f2b