Merge "DO NOT MERGE Fix status fetch from supplicant" into gingerbread