Merge "Change the condition strictly for comparing address"
am: 13cb63be27

Change-Id: If4ab7ad95200b86bc103c2f3fd8535870637133d