Merge "Add accessors for all addresses and clarify compare* methods" am: a5094dc770

Original change: undetermined

Change-Id: Ia5641ab72e9cf81bca7fd8253ff009565fc5c0b0