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

Change-Id: I4f912f0f74dc8192f34ef0a6c2976c6f3bdee700