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

Change-Id: Icd6e736b90ed18682b1fedcfc6f736c76e9670a7