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

Change-Id: I83cf088295fe2571cb43f9c2032a7e39f5dcb3d3