Merge "dra7xx-evm, beaglebone: Switch to sdimage-bootpart-uuid for wic"