Merge "Delete old WifiNotificationController strings." am: 6daef4499f am: f412290e94 am: 62f70c44b8
am: 8e52be9d55

Change-Id: I86add6c75edea299edb3bb4dad63450504889d56