Merge "Fix for wifi detail icon disappearing" into oc-dev am: db0836779e
am: 9821fb5b08

Change-Id: I82b1989ce739ad2ea11b904030cbda8b951b0574