Merge "Use std::move() for rvalue-reference setters and ctors" am: 4848b6d7c3
am: 24c8c6e397

Change-Id: I40ba1748f8dbde0c5b0adb9881100e88239843af