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

Change-Id: I74c3fffe8c500094133045ac17e51c9833f0f9d2