Merge "Add "wifi lost" disconnect message." am: 4ea1c53a70
am: 1b38ddb4c5

Change-Id: I47b486093d5544248b109185e43a438e8d6c3052