Merge "Merge "CP: Reduce max iter count in alloc_callback_fail.device" into nougat...