Merge "Blacklist Display#getAddress" into rvc-dev am: 15842bc4cb am: b0817a832d am: b7c914a453 am: d27035f2ea am: bf210cbec0

Change-Id: I00408cf05b3c5dc6290947251bb44b30afc89f7b