* stable-2.12: Fix comparison using reference equality instead of value equality Change-Id: Ib9e77ff49f8741dc3765ad7930c1e3d077448ce2