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

Change-Id: Ie4e7e1ba5a01d82130f77e2e2ed69784f3ac4257