Merge "Merge "Make RawAddress into a class (2/3)" am: 31e94c57e9" into stage-aosp-master
am: 2063592cd2  -s ours

Change-Id: Iee1c12bd4e9163ead3e136c5cf8a0c50ca9a9732