Merge "Lite bugreports(wifi/telephony) don't need screenshots" am: e5e8285246
am: e743811c05

Change-Id: I5d5b0da61f989bdea6162737b76ca766167fdc89