Merge "Fix alpha on wifi disconnected icon" into oc-dev am: ea8f49ce8e
am: 829597d9e6

Change-Id: I39c01013ce480fc2f6a09accd7eebc05b8efbfd4