Merge "Fix alpha on wifi connected 4 bars no inet icon" into oc-dev am: d168f89b0a
am: 93e1244e44

Change-Id: I1c3eb6facb7c12d8ca202b9dd09a2620b5d6eab6