Merge "bootctl: Return<T> is non-copyable." am: c38d4f183c
am: 7df6e74999

Change-Id: I0d48172354849ed086c906588a16cafd73d9ab2d