Merge "Fix bugprone-use-after-move warnings" into rvc-dev am: 538eebb155

Change-Id: I37273bb7d33872e23c504916401363db52851ea9