Merge "init: add extra std::move" am: d72d92aee2 am: 7a23e13edb
am: fecca8eef1

Change-Id: Ifa816d0bb2b6e5e784aed66972f30316560ace55