Try disabling Smart switch under wifi settings to prevent lollipop from using data instead of wifi Whenever it chooses
