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

Change-Id: I36eee2edea3b3767169f349d99d5cb454c797aa5