Merge "Only check for powerwash in A/B ota packages"