Merge "Check values for various is* when determining dups"
am: 9a7e29fe91

Change-Id: If0f408673674d3c7a4870378e6114ca753ed6bbf