Merge "WifiTile: Avoid NPE during boot phase" am: b23150ffa9
am: 0d90a0690b

Change-Id: I65e814b392cc0891f970223c2ded27c7420205dc