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

Change-Id: Ibae71b9ba5dbb5e5cfccd770bd16d16bfe215ab0