Merge "Merge "Fix Location equals()" into sc-dev am: b42181c3 am: 81321095 am: bf93994c" into sc-v2-dev-plus-aosp