fixes to make wifi priority work

Change-Id: Ia2832f8469808975ddd5d0f5104f9b9dc9ef6f9c