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

Change-Id: I3a784bdfe3ffaebb85f7635dac8f561996f7abe5