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

Change-Id: I9a2ca409c987c19c64e3ec1f3fcdb73ef889789e