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

Change-Id: I3d47da8c851f899685b29a8890ca4ca83e5ca5c6