Merge "Blacklist Display#getAddress" into rvc-dev am: 15842bc4cb

Change-Id: I239c3f359b78372ee9fcb9aa4f008e2a67ce2c48