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

Change-Id: I95544b5507b89bc4354f49a191714fb3b56a09f6