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

Change-Id: I32e3d8a776dc51689c7abcea9d0af6fe7d1d35ca