Merge "Merge "Make RawAddress into a class (4/4)" am: 1bd5a3ff87" into stage-aosp-master am: b48a8a219f  -s ours
am: cb51cb26b5  -s ours

Change-Id: I28fc23fa73212d0876f8436c1cf41324254f0dcc