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

Change-Id: If68306b217d19fb1d1d4bc71a8fd452a47aa8ed2