Merge "Avoid binding const references to temporaries."
am: 80dd30abe3

Change-Id: I208eec682121bd46397c1a4e778d83bd50924b2c