Linaro-4.7
Fixed missing OC/UC configs