Merge "Make bootctl work on devices that does not have v1.1 API"