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

Change-Id: Ib7eae1d785c1681d682878f4e5c99b46780c593c