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

Change-Id: Ie2fe3a75bd3baa5181cd1b1cb7a2b2d220072b81