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

Change-Id: I7bca05053fcfe39b04b8181ef11d32b313a7f0a7