Merge "Don't implement our own remove_cvref_t." am: a93e09f834 am: 10d5983b42
am: 52a2b8e4da

Change-Id: I2b81d07dfa93d844f5e7f4e82beaabfa8709bb27