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

Change-Id: I7e79602a01da08990bacdd220245bfaee150e0dc