Merge "SymbolComparator operator() is missing const"
am: e74483074e

Change-Id: I86f332f10f87d519c42c5880c49dacf98be2c9e5