wifi driver matching cm, but keeping previous change

Change-Id: I41eb326efbfdc95defbed125f5f3d89d2936bc26